TeX 1995 July/TeX CD-ROM July 1995 (Disc 1)(Walnut Creek)(1995).ISO/tex-k/tex-k-archive.past/tex-k-archive.gz/tex-k-archive/[e-mail]_Mon Jun 13 17:49:34 1994.msg

Internet Message Format | 1994-10-11 | 8KB

Received: from aragorn.ics.muni.cz by cs.umb.edu with SMTP id AA02670
  (5.65c/IDA-1.4.4 for <[e-mail]>); Mon, 13 Jun 1994 09:50:47 -0400
Received: from daeron (daeron.ics.muni.cz) by aragorn.ics.muni.cz with SMTP id AA01623
  (5.67a8/IDA-1.4.4); Mon, 13 Jun 1994 15:49:09 +0200
Received: by daeron id AA22296
  (5.67b8/IDA-1.4.4); Mon, 13 Jun 1994 15:49:37 +0200
From: Petr Sojka <[e-mail]>
Message-Id: <199406131349.AA22296@daeron>
Subject: Bugs in kpathsea & xdvik 1.8 with patches included
To: [e-mail] (Karl Berry), [e-mail]
Date: Mon, 13 Jun 1994 15:49:34 +0200 (MET DST)
Organization: Masaryk University, Brno, The Czech Republic
Postal-Address: Institute of Computer Science, Buresova 20, 60200 Brno
Telephone: [phone] ext. 283, Fax: [phone]
X-Mailer: ELM [version 2.4 PL23]
Content-Type: text
Content-Length: 7095

Hi Karl & all,

we are installing web2c 6.1 on SunOs 5.3 (Solaris)
(dvipsk 5.55a, xdvik 1.8, dviljk 1.1) with latest patches
from ftp.cs.umb.edu). We've found several bugs in
kpathsea library and xdvik (see patches below).
(328-329DPI problem, environment variables substitution,
// handling etc.)

We hope that these fixes will be incorporated in the new version
of programs.

Regards
Petr <[e-mail]> , Zdenek <[e-mail]>

--------------------
This is patch for kpathsea 1.8.
Included changes:
in db.c - implemented // path construct for database seaches
in pathsearch.c - fixed environment variables substitution
                  if search is limited to db,search db irrespective to
                    elt_in_db ( %%/packages/tex// when DBDIR=/packages/tex/lib )
in tex-glyph.c and tex-make.c - adjust dpi when it doesn't exactly match
                                desired magstep


*** kpathsea_orig/db.c    Thu Mar 24 16:18:58 1994
--- kpathsea/db.c    Mon Jun 13 11:35:56 1994
***************
*** 78,85 ****

  static boolean
  match P2C(const_string, filename,  const_string, path_elt)
! {
!   return true; /* Punt for now.  */
  }

  /* Don't bother implementing a search path for the database itself, or
--- 78,98 ----

  static boolean
  match P2C(const_string, filename,  const_string, path_elt)
! {
!   if (*path_elt++!=*filename++) return 0;
!   while (*path_elt==*filename)
!     if (*filename==0) return 0; else path_elt++,filename++;
!   if (*path_elt==0)
!     if (*(path_elt-1)=='/' || *filename=='/') return index(filename+1,'/')?0:1;
!       else return 0;
!   if (*path_elt=='/' && *(path_elt-1)=='/')
!     { filename--;
!       while (!match(filename,path_elt) && (filename=index(filename+1,'/')));
!       if (filename==NULL) return 0;
!       return 1;
!     }
!   return 0;
!
  }

  /* Don't bother implementing a search path for the database itself, or
*** kpathsea_orig/tex-glyph.c    Thu Mar 24 17:26:19 1994
--- kpathsea/tex-glyph.c    Mon Jun  6 16:17:13 1994
***************
*** 294,302 ****

        /* OK, maybe we can create it on the fly with MakeTeXPK.  */
        if (!ret)
!         {
            source = kpse_source_maketex;
            /* `try_resolution' leaves the envvar set randomly.  */
            xputenv_int ("KPATHSEA_DPI", dpi);
            ret = kpse_make_tex (format, font_name);
          }
--- 294,304 ----

        /* OK, maybe we can create it on the fly with MakeTeXPK.  */
        if (!ret)
!         { int bdpi;
            source = kpse_source_maketex;
            /* `try_resolution' leaves the envvar set randomly.  */
+           if(bdpi=atoi(getenv("KPATHSEA_BDPI")))
+                 dpi=kpse_set_maketex_mag(dpi,bdpi);
            xputenv_int ("KPATHSEA_DPI", dpi);
            ret = kpse_make_tex (format, font_name);
          }
*** kpathsea_orig/tex-make.c    Wed Feb  2 15:58:53 1994
--- kpathsea/tex-make.c    Mon Jun  6 16:39:53 1994
***************
*** 196,202 ****
     absolute-value function that is all we need.  */
  #define ABS(expr) ((expr) < 0 ? -(expr) : (expr))

! void
  kpse_set_maketex_mag P2C(int, dpi,  int, bdpi)
  {
    int m, n;
--- 196,202 ----
     absolute-value function that is all we need.  */
  #define ABS(expr) ((expr) < 0 ? -(expr) : (expr))

! int
  kpse_set_maketex_mag P2C(int, dpi,  int, bdpi)
  {
    int m, n;
***************
*** 263,268 ****
--- 263,270 ----
  #endif /* not DOS or OS2 */

    xputenv ("MAKETEX_MAG", q);
+   xputenv_int("KPATHSEA_BDPI",bdpi);
+   return (m==9999|| m==0)?dpi:n;
  }

  /* I don't think it makes much difference whether we check if DPI2 can
*** kpathsea_orig/pathsearch.c    Thu Mar 24 16:18:58 1994
--- kpathsea/pathsearch.c    Mon Jun 13 15:05:55 1994
***************
*** 166,172 ****
          }

        /* Try the prebuilt db only if it's relevant to this path element. */
!       try_db = elt_in_db (elt);
        found = try_db ? kpse_db_search (name, elt, all) : NULL;

        /* Search the filesystem if (1) the path spec allows it, and either
--- 166,173 ----
          }

        /* Try the prebuilt db only if it's relevant to this path element. */
!       /* elt_in_db is too limiting , override al least with %%  */
!       try_db = (elt_in_db (elt)||forbid_fs_search);
        found = try_db ? kpse_db_search (name, elt, all) : NULL;

        /* Search the filesystem if (1) the path spec allows it, and either
***************
*** 218,224 ****
     terminated with NULL.  */

  static string *
! search P4C(const_string, path,  const_string, original_name,
             boolean, must_exist,  boolean, all)
  {
    str_list_type ret_list;
--- 219,225 ----
     terminated with NULL.  */

  static string *
! search P4C(const_string, orig_path,  const_string, original_name,
             boolean, must_exist,  boolean, all)
  {
    str_list_type ret_list;
***************
*** 225,231 ****

    /* Make a leading ~ count as an absolute filename, and expand $FOO's.  */
    string name = kpse_expand (original_name);
!
    /* If the first name is absolute or explicitly relative, no need to
       consider PATH at all.  */
    boolean absolute_p = kpse_absolute_p (name);
--- 226,232 ----

    /* Make a leading ~ count as an absolute filename, and expand $FOO's.  */
    string name = kpse_expand (original_name);
!   string path = kpse_expand(orig_path);
    /* If the first name is absolute or explicitly relative, no need to
       consider PATH at all.  */
    boolean absolute_p = kpse_absolute_p (name);

Patches for xdvik and dvipsk to solve 328/329dpi problem (uses kpathsea
with above patches applied).
Analogous patch should be applied to dviljk.

*** xdvik-1.8_orig/xdvik/dvi_init.c    Fri Mar 11 19:30:57 1994
--- xdvik-1.8/xdvik/dvi_init.c    Mon Jun 13 15:32:55 1994
***************
*** 172,180 ****
      int    size_found;
      int    magic;

!         if (use_maketexpk)
            /* In case font_open winds up calling MakeTeXPK.  */
!           kpse_set_maketex_mag (dpi, pixels_per_inch);

      fontp->flags |= FONT_LOADED;
      fontp->file = font_open(fontp->fontname, &font_found,
--- 172,180 ----
      int    size_found;
      int    magic;

!         /*if (use_maketexpk)
            /* In case font_open winds up calling MakeTeXPK.  */
!           fsize=kpse_set_maketex_mag (dpi, pixels_per_inch);

      fontp->flags |= FONT_LOADED;
      fontp->file = font_open(fontp->fontname, &font_found,
*** dvipsk-5.55a_orig/dvipsk/loadfont.c    Fri Apr  1 18:51:30 1994
--- dvipsk-5.55a/dvipsk/loadfont.c    Tue Jun  7 10:55:43 1994
***************
*** 135,142 ****
     {
       char *name = concat (d, n);

       xputenv ("MAKETEX_DPI", itoa (fd->dpi));
-      kpse_set_maketex_mag (fd->dpi, DPI);

       /* Don't run MakeTeXPK if it's been globally disabled or
          if the font is absolute_p.  */
--- 135,142 ----
     {
       char *name = concat (d, n);

+      fd->dpi=kpse_set_maketex_mag (fd->dpi, DPI);
       xputenv ("MAKETEX_DPI", itoa (fd->dpi));

       /* Don't run MakeTeXPK if it's been globally disabled or
          if the font is absolute_p.  */